#todo - develop this or delete it