Overhaul for two sources.

Signed-off-by: Nicholas <amperific@gmail.com>