Added Comments, things are still hardcoded though