I started working on this before I went away and decided before I jump to any new stuff I should finish this first;)