fully functional stuff
fully functional stuff, removed testing