Added my previous work, done in my spare time