Build ready 1

I think this should make it ready for jenkins build?