Implemented First two of Mike's challenges

#35