Added some code, still working on it