STILL BROKEN, adding features. Temporary checkin