this is inconcluse
this branch is starting to get in shape :)