Revised

Added some of the missing requirements, almost completed with project