Please do whatever you think is right with this code :) (or if I should move/remove it please let me know).