Basic functons working. Working on design/extra features