big refactor, added graphics and files