working now
bug fixes
move files