Main functionality works
Main functionality works, fixes