notreally finished yet, still working on some issues
not done, still working and trying to commit these changes