Development ready

Development stuff