Almost of basic functionality complete

yay!