Some wierd stuff in the commit; I will take out my development
files soon