Added stuff, if-else is broken for now