added new stuff which broke alot
working on ORM