just some todo's, been busy :(