Basic coding done, continue on testing