Work on refactoring
Fix elements
Work on refactoring
Work on independance
Simplify some framework stuff