added basic stuff, changed the function naming scheme