pushed to beta (v0.1)
added most functions and definitions