fixed couple of hard tabs...
Attempts to remove disgusting if-else blocks and create true URL endpoints... some progress