Ready to send, fixed shell.. Milestone 2