Committing code

with deprecated stuff as well to back it up