Revision 3

Partial Updated code
Has errors!