Fixed bugs and took out Outgoing for testing purposes