bout to pull working version from lucas/
Added part 3