20140516 So far working

Rubilded and working, need to complete the functions