pre merge
added some very basic routing