[Delivery] Merged with Mario's code

This is the code submitted at the deadline. There is still much to be
done.
-Mostly added sow stuff (still needs work)
-Added stuff to the menus, added some auxiliary functions and organized
and idented code.
-Merged with Master