commit after solving first few bugs
Another commit