Beta.v3

Working version. Need to polish the UI still.