Unfinished commit, lets see how it works out.