Hacked it to work for demo

Due to a time limit I where forced to hack it up so my group had
something to show. This project will however be further developed into
something logical at a later point.