Big Change

not fully implemented yet but almost there