A36444 V 0.0.5

Cleaned up the code a bit.
It seems to be working well
Need to test with a real Lambda